From: Giovanni Campagna <gcampagna@gnome.org>
Date: Fri, 20 Mar 2015 19:56:52 +0000 (-0700)
Subject: dash: use global settings instead of own settings object
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1404
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=018025dada71522255677720deb997cf1a43e629;p=gnome-shell.git

dash: use global settings instead of own settings object

Makes it easier to reason about change notifications

https://bugzilla.gnome.org/show_bug.cgi?id=746509
---

diff --git a/js/ui/dash.js b/js/ui/dash.js
index ba137c7ad..246bc108b 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -242,8 +242,6 @@ const ShowAppsIcon = new Lang.Class({
     _init: function() {
         this.parent();
 
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-
         this.toggleButton = new St.Button({ style_class: 'show-apps',
                                             track_hover: true,
                                             can_focus: true,
@@ -272,7 +270,7 @@ const ShowAppsIcon = new Lang.Class({
         if (app == null)
             return false;
 
-        if (!this._settings.is_writable('favorite-apps'))
+        if (!global.settings.is_writable('favorite-apps'))
             return false;
 
         let id = app.get_id();
@@ -430,8 +428,6 @@ const Dash = new Lang.Class({
 
         this._workId = Main.initializeDeferredWork(this._box, Lang.bind(this, this._redisplay));
 
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-
         this._appSystem = Shell.AppSystem.get_default();
 
         this._appSystem.connect('installed-changed', Lang.bind(this, function() {
@@ -864,7 +860,7 @@ const Dash = new Lang.Class({
         if (app == null || app.is_window_backed())
             return DND.DragMotionResult.NO_DROP;
 
-        if (!this._settings.is_writable('favorite-apps'))
+        if (!global.settings.is_writable('favorite-apps'))
             return DND.DragMotionResult.NO_DROP;
 
         let favorites = AppFavorites.getAppFavorites().getFavorites();
@@ -943,7 +939,7 @@ const Dash = new Lang.Class({
             return false;
         }
 
-        if (!this._settings.is_writable('favorite-apps'))
+        if (!global.settings.is_writable('favorite-apps'))
             return false;
 
         let id = app.get_id();